added glyphicons and stuff
moved some stuff around