Grid and button changes

Updated buttons to bootstraps, fit everything into the bootstrap grid.