Fix the Pick / Create / Done interface.