code clean up and refactoring
now showing same offer on main screen which was shown before on splash screen
coe clean up
Merge branch 'master' into GreenScreenPerformance