Lots of GUI cleanup.  Updates #141, #142 & #143