Update Controller methods to 3

Changed single method with triple nested If statement to less confusing
individual actions call