Added in screen switching logic