First phase of UI fixes