Added buttons and fixed some Add Tag issues.