fixing focus state for btns
Merge branch 'master' of github.com:GJST-Capstone/Capstone-Project