Added more functionality to UI.
Merge remote-tracking branch 'origin/master'