Started restoring header-toolbar functionality, clean-up.