UI polishing phase 1