button logic
start
Merge branch 'buttonsLogic' into develop