Changed markup and styles