fixed bootstrap grid not working on lower resolutions
merging
fixed duplicate
fixed an accidental delete