Working rewards bar
Fixed Merge conflict in RewardsFragment