Fix Mockup1 feedback - https://trello.com/c/ZFyMv23S/2-mockup-1-feedback