Still tracking the UI bug, now with tabbed navigation