Fixing bugs in the UI