toolbar fix and general cleanup