added glyphicons + button reordering