Comment 3 for bug 804018

Thanks Christian for looking into my work, and sorry again for letting you work on the broken version. Your comments are useful though; I will update my branch accordingly. I will also look into the mockup you refer to; I didn't know it existed.

I will let you know as soon as this is ready for review.