Removed excess toolbar and replaced it with a single non-floatable toolbar that has a separator