Updates to Markup and Label creation UI