Huge commit with most of the new design markup and styles