Done with style from mockup
Merge