Migrate to th, class cleanup
Added a few bootstrap classes