Finished the toolbar design