Improve edit screen layout