Issue #57 Ensure Correct Extension and add label to form