Getting close
[Fixes #3] Deleting items from lists redraws correctly
Refactoring