Updated to HTML 5 style