Changes to use Tabs instead of a menu bar