re-made an app according to mock-up