Some small updates to UI