'Bar' menu cleanup, minor bug fixes