Added uninstall button & cleanup