clean up icons, put navigation in the title bar