#12 js and css refactored