Others small changes to the mockups (v6) : it's getting better :)