Fixed up some style and markup issues

Attempting at fixing some of the issues