* Improve layout for some Android versions

