Chaning all toobars around to support future delete functions
More work on the toolbars and look of the pages for editing