Remove glyphicons (and a few touchups)