Just a bunch of style/markup changes