Fix layout isssue