final changes to UI