added mockups, changed settings