Convert more html to bootstrap markup
Clean up property names, more integration with Bootstrap