Fix toolbar items order
Don't try to access private property
Small cleanups