Updates UI as suggested by Chris.
Merges master into production branch