huge update to switch to tabbed design