WIP: refactored layout and more exts work