added more groupings
last edit
added show and hide buttons
merged