Upgrade Button Merge

Upgrade Button and new Intents will be made. The first intent is
activated by button the second by swipe.