admin bar refactoring/update