Integrating Matt's User, UserValidator, layout and ScheduleFragment changes.