Navigational & UI enhancements from 7/22 Onsite