Fixed some merge conflicts from advancedUI