Added missing buttons
Removed unnecessary print commands