exchanged icons and consolidated navigation