New layout, navigation panel corrections