updated toolbar logic so remembers what box you had
merging in dan and peters work to my client changes

Merge branch 'master' of github.com:sociam/indx
boop

Merge branch 'master' of github.com:sociam/indx