Adjust Semantics

Because everyone has a different opinion on HTML5 Semantics