work, more ui changes, and fixed some bugs