Issue #39,fixed spacing
Issue #39, Remove spaces in form