added disabled state to buttons
added more disable stuff to buttons
fixed bug
Merge branch 'feature-btn-disable' into develop