bugs fixes & ui changes