sorted our js and css setup