Moved user-selection into DinodexController. Fixed formatting - updated functional-test