Fixed up some style and markup issues