refactor extended_toolbar class