Included deleted user reactivation
Added ordering to strategies and indicators