Bunch of changes to UI