UI fix for main windows ref #29