Refactored Listeners inside Screens. Broke out code from changed methods into own methods.