Totally rebuilt the UI