Last UI and inprovements