UI updates.
Merge branch 'master' into development