UI & some fix