CSS and element naming clean up