CSS transform and JS fix.
Merge conflict.