WIP: Draft of new UI layout, updated after zipper refactoring