More Layout adjustment, nav transitions, added icons and much more