I might still go back on the one window design (I could also possibly make it so that the sidebar could be detached from the main window at will). Mockups are one thing, ingame proof-of-concepts are another thing entirely
I'm working on the activation now, I've got a "few" changes made there already.