Porting classes to use bootstrap 3
Lots more fixing for bootstrap 3