A few more navigation/layout tweaks