As in Issue #41
Move outer height and width to elements
Cleanup
Rebuild