Fix Form Labels. Fixes #1 & Fixes #2.