Asgoyal UI enhancement