Some source rejiggery and added support for onResize height matching