GUI upgrades rebased
Cleaned up version of !510 (merged) (which see for description and discussion), rebased on current master, ready to be merged.
Cleaned up version of !510 (merged) (which see for description and discussion), rebased on current master, ready to be merged.