Don't render input inside label
Bring mockup markup inline with reality and update scss/css