Add a button for merging mashups
Add a button for the wiring
Update test code
Add a button for going to the marketplace