updates to first exchange view
Merge branch 'master' of https://github.com/abhiyerra/keymaster