navigation, some layout tweaks