Ui / presenter improvements