Updating UI and FIxing Bugs