Ui ux improvements

Ill do a seperate PR for all that.