Mockup ui merge 

Merging to master