Clean up CSS
Use more uniform names for element IDs