Added tabbed panel. Still needs mode change