Improve file context layout