few UIX fixes