refactor the toolbar and masthead components to match the navbar refactor