fixes, tabbed navigation