Cleaned up screen outline, added some notes on enhancements to work on