Revalidated HTML5 and cleaned up options