Ui ux improvements