Make labels data-driven
Fix event hide/show
Delete old files
Merge branch 'refactor' into peter