Fix button grouping in navbar

Fixes #108