Bug fixes and u-factor UI work