UI version 2 with timer
Merge remote-tracking branch 'upstream/ui-dev' into ui-dev
Merge pull request #39 from sai-sriram-mahavadi/ui-dev

Ui dev (Version 2) with timer