Bugfixes and adding Cal-Button