Started working on the UI.
Merge remote-tracking branch 'origin/master'