Tweaking and bugfixing button