Fix layout issues on some devices