polishing up code and css