Updated to 3.6 markup and styles