Reorganized grid view into more logical hierarchy
Folded zoom control into genericinput