improved screen layout