better controller org, reset modal
navbar toggle, toolbar cleanup
tidying up, no major changes.  pending data structure refactor