Fixing up the css, using bootstrap better