Ui changes

merged before launching