much UI polishing