Small Bugfixes, make Button checkable