Complete overhaul of markup and styles