Add fields to modify spray options in ContextBar
Remove tool configuration from ConfigureTools command (it's in ContextBar now)