F: improve layout