Couple of TODO comments in the UI