Add bootstrap styling
Fix bootstrap merge conflict in index