Fix hero img stretch on android
Finish cleaning up hero img stretch