Bug 881224 ui improvements

r? @ednapiranha (bribing you with :meat_on_bone:)