UI improvements and added glyph icons