More work on new layout, somewhat backwards compatible still