started work on stock exchange UI
Merge origin/master