Initial commit after revamp - layout is there, but only editor is functional