Cleanup UI a bit, simplify navigation logic by using existing widgets