Add .group and .with-label classes; Restructure sign up form