Reorganized ToolbarView and button panel classes for consistency