Still ugly, but it now has a NavBar instead of the old method