See issue #47. UI cleanup