Merge pull request #491 from hnyman/reorganise-stats-menu