Fix layout of screens