Better markup and css