[UPDATE] separate pages, new icons, navigation update