Added icons, Updates to Navigation UI, Routing work-around for login