Broken-Theme Fixes

Thanks.
If we use #wrapper here it will append the modal as the last child in #wrapper.