do some changes in mockup