Added more coloring and the complete menu

Fixed colors for some lingering HTML elements and TODO comments.
Use abbreviations