Added more gfx and mockups
Merge