trimester update and some ui fixes