grc: Small fixes to make menu items consistent.
grc: clean-up toolbar