Fix more UI and popup navigation issues