UI fixes for ids and labels