Add Bootstrap and fix helpers