#302, #307, #313, #314 Various GUI changes.