fixed some game dashboard stuff
fixing merge conflicts