some bugfixes and redesign of main ui