Functional user interface. Changed a few minor details.
Merge origin/master