UI optimization. RC1