Some more navigation customizations added