A series of ui updates to clean and polish