dhiru's UI changes