UI & Navigation improvements