Merge pull request #735 from sexnothing/bootstrap3

Layout update
BS3 update