fixed #61 and more UI changes

fixed #61