Improved html and css layout