A few changes made to UI