Added edit button and glyphs