Updated to show current screen layout