fixes #8 Corrected binding and stuff for delete button popup
Minor changes and cleanup to buttons