issue #6
issue #7
change ui design.