Ready to merge in changes to dashboard and rewarding page