Enable/Disable buttons
Merge branch 'Sebastian'