Updated with current screen layout