Properly include bootstrap
Minor layout change