Redid viewpager, reimplemented logic for welcomescreen
conflict solving