toolbar taken out of assessment controller; re-org of code into modules