Ui changes, loader fixes