Main UI updated