Clicking stuff, code cleanup, ...
Save some minor changes