finished modifying use of boototstrap grid
Fix of merge conflict and hopefully good things
More merge resolving keeping @ppyordanov 's modifications