UI updated- Manli