Changes for mapping UI