Moved hiding toolbar from non-admin-users to separate method.
Removed unused value selection as it's always overwritten by the incoming bean value.