updated markup and css