Layout-small improvements