Some code and css improvement