Fix top padding when scaling down.
Resolve merge conflict.