shape up some markup and css