code review + fine tuning UI