Cleaning up some html, need to make this a little more configurable