Minor refactor of stat menu