added top toolbar, lots of fixes