Improved Edit Tags Design