new style toolbar with name of app
merge with myself

Merge branch 'emax' of github.com:sociam/indx into emax