Clickable mockup version 1
Fixed conflicts