GUI fixup and other