UI Fix
Merge branch 'master' of https://github.com/kony/StockTrack