[#5] Removed commented out code
[#5] Moved screens into new file
[#5] Removed old screen files