Bugfixes & Dashboard development