added lots of buttons, lacks organization
Merge branch 'staging'