cleanup
fix runtime exception
working on #7 and #8.

layouts not inflated?