feat : working on UI feedback

close #40