Some improves in UI