clean up of the tray area
reworked views to include builder and table
Merge branch 'newDesign' into develop