Bugfixes / Main Form Design