last changes for exercise 4 and more mockups =)