Working ui
Integrated with neeraj changes