UI changes, delete, need spacing and testing