More work on the computer GUI, minor fixes elsewhere