UI + Navigation Improvements