Revert 627212a..7eb80f1

This rolls back to commit 627212a2a795ec70bc8fee816cc77abb8538b31c.
Adding ability to close screen