Corrected button behaviour

Buttons should be completely working now.