Add notes and mapping controls