Updated screen layout