Changed button bar layout.
Refactored choice menu and button bar visibility handling.