Update UI

Changed Structure