fix hero transition, etc.
layout tweak