GUI changes suggested by Fabien Baron.