Cleanup (mostly buttony things, user feedback etc.)