refactor html and css clean up add shorthand