Resolves #21, #22, #24

Minor GUI tweaks for clarifying labels