BS3 updates 

Updated gleez/cms#622