Merge pull request #1 from sgkit/develop

Develop
Merge pull request #2 from sgkit/develop

Develop
Merge pull request #3 from sgkit/develop

Develop
modified form label structure
Various input styles