Fiinish all mockup

Fiinish all mockup