Switching to tabbed design