Merging back in css tweeks