Fixed some incorrect markup, added GA Tracking