Pull in White October's UI changes

Fixes https://github.com/theodi/shared/issues/171