Redoing the UI structure