New versions of the mockups + addition of menu