Fixed up modal with labels