Quick changes to current screen logic