CSS styles for Menu commands, and some refactoring