Note that icons were added.
Use glyph icons everywhere.