WIP: rearrange things to follow the new UX specs