Some slight tweaks to make navigation easier