removed Control Panel
refactored table into its on tab