cleaning up code, added icons, fixing navigation