Style and navigation improvement