Secondary toolbar

Implements the secondary toolbar as discussed in #2714.