UI updated. Almost there.