0.3

finish logic and part of UI