Added functional Screen Switching and cleaned up some code