ui working right, added partial class to cleanup