Fixes to boostrap template