tied in add functionality and cleaned up other buttons
merged from origin