Modified screen layout logic