Changed views to swap using buttons 1, 2 and 3
Merge branch 'dev'