More changes

Some GUI improvements. Check commit messages for details.