UI modifications issue #62