feat : working on UI feedback

ref #40