UI changes due to issue #87.