Fixed the active button issue
Merge branch 'master' of github.com:KPWhiver/stocksim