some more refactoring, bar toggle fixes