Added support for custom user model and fixed a bug in the toolbar