better games display
fix bugs in user show page
add charts to user dashboard
resolve merge conflicts