Made some fixes to the toolbar skeleton