CSS changes as per mockup and semantic change