Fix HAL-182
cleanup user menu