UI - js polishing