Moved glyph rendering back to button draw method