js fixes
Only show label element on-demand