Major GUI changes for #8. Safety first!