Added some labeling to tags
Group buttons
Fixed inserting from popup window