Fixing some of the html, changing default theme