covered edge cases, added status label, tidied up UI