Layout
Cleanup
Got rid of property warnings
Refactored variable names for buttons
Implemented grouping and ungrouping
Made constructor public to facilitate debugging
Keyboard handling
Restored row names

Fixes bug introduced in #162ad54