<Riya/Pulkit> UI work