Final commit for UI from Chaitanya