fixed some UI & image issues