Fix UI errors