Add all use cases, change some mockups
Add changes for some cases