fixing bugs UI done