Added Toolbar Test.
Added toolbar functionality
Merged ToolBar updates in