Make the UI keep it's shape a bit better

Refs #10441