minor changes to avoid throwing an exception on logout
merging in small fixes to toolbar code with dan's

Merge branch 'master' of github.com:danielsmith-eu/webbox
minor fix pertainig to exception on logout