Upgrade screen functional; derp rendering cleaned up