Fixed a number of moms ui complaints.