Added changes to main UI