move navbar into page layouts, add icon. index cleanup.