first feature done need ui fix