UI update - added new user control and fixed misc UI