Fixed Bugs, updated UI