Layout Fixes

Changed layout to Bootstrap
Fixed style override in scaffolds.css.scss