Hey everyone, Let's discuss the wireframes: https://github.com/hbons/aerogear-design/blob/master/aerogear_unified_pus... based on https://gist.github.com/sebastienblanc/6547605. The mockup is getting a little big and confusing now, so I've marked the new parts in orange. :) Feature wise we should be there. Let me know if you have any comments or if things are unclear, so they can be improved. Thanks, Hylke