repair commits from aa1b236239d30bc7729ac1e24abff03f5d1f44ee
layout changes