Adds menu buttons
Merges with master
Merges with test