Bugfixes and improve control panel