Moved markup template tag to dedicated template tags directory for better organization
Added obfuscated email contact link
Added hidden class to form labels for future hiding