More optimization, UI modifications, and Navigational improvements