Some unified push layout improvements
Moved Push layout into a partial