Changed bootstrap grid-columns back to 12
Merging changes