         #    well_style.color           = 'white'
         #    well_class = 'webapp-landing-sign-up-highlight'
         <Well style={well_style} className={well_class}>
-            <TermsOfService style={fontWeight:'bold', textAlign: "center"} />
-            <br />
-            {@display_token_input()}
-            {@display_error("token")}
-            {@display_error("generic")}                   {### a generic error ###}
-            {@display_error("account_creation_failed")}
-            {@display_passports()}
+            {### <TermsOfService style={fontWeight:'bold', textAlign: "center"} />  <br /> ###}
             <AccountCreationEmailInstructions />
-            <form style={marginTop: 20, marginBottom: 20} onSubmit={@make_account}>
-                <FormGroup>
-                    {@display_error("first_name")}
-                    <FormControl
-                        ref         = 'first_name'
-                        type        = 'text'
-                        autoFocus   = {false}
-                        placeholder = 'First name'
-                        maxLength   = {120} />
-                </FormGroup>
-                <FormGroup>
-                    {@display_error("last_name")}
-                    <FormControl
-                        ref         = 'last_name'
-                        type        = 'text'
-                        autoFocus   = {false}
-                        placeholder = 'Last name'
-                        maxLength   = {120} />
-                </FormGroup>
-                <FormGroup>
-                    {@display_error("email_address")}
-                    <FormControl ref='email' type='email' placeholder='Email address' maxLength={254} />
-                </FormGroup>
-                <FormGroup>
-                    {@display_error("password")}
-                    <FormControl ref='password' type='password' placeholder='Choose a password' maxLength={64} />
-                </FormGroup>
-                <Button
-                    style    = {marginBottom: UNIT, marginTop: UNIT}
-                    disabled = {@props.signing_up}
-                    bsStyle  = "success"
-                    bsSize   = 'large'
-                    type     = 'submit'
-                    block >
-                        {<Icon name="spinner" spin /> if @props.signing_up} Sign up!
-                </Button>
-            </form>
+            {@render_terms()}
+            {@render_creation_form() if @state.terms_checkbox}
             <div style={textAlign: "center"}>
                 Email <HelpEmailLink /> if you need help.
             </div>

        has_remember_me : rtypes.bool
        get_api_key     : rtypes.string

    make_account: (e) ->
        e.preventDefault()
        first_name = ReactDOM.findDOMNode(@refs.first_name).value
        last_name  = ReactDOM.findDOMNode(@refs.last_name).value
        email      = ReactDOM.findDOMNode(@refs.email).value
        password   = ReactDOM.findDOMNode(@refs.password).value
        token      = ReactDOM.findDOMNode(@refs.token)?.value
        @actions('account').create_account(first_name, last_name, email, password, token)

    display_error: (field)->
        err = @props.sign_up_error?.get(field)
        if err?
            <div style={ERROR_STYLE}>{err}</div>

    display_passports: ->
        if not @props.strategies?
            return <Loading />
        if @props.strategies.size > 1
            return <Passports strategies={@props.strategies} get_api_key={@props.get_api_key} />

    display_token_input: ->
        if @props.token
            <FormGroup>
                <FormControl ref='token' type='text' placeholder='Enter the secret token' />
            </FormGroup>

    render: ->
        well_style =

The Landing Page
###
{rclass, React, ReactDOM, redux, rtypes} = require('./smc-react')
{Alert, Button, ButtonToolbar, Col, Modal, Grid, Row, FormControl, FormGroup, Well, ClearFix, Checkbox} = require('react-bootstrap')
{ErrorDisplay, Icon, Loading, ImmutablePureRenderMixin, Footer, UNIT, COLORS, ExampleBox} = require('./r_misc')
{HelpEmailLink, SiteName, SiteDescription, TermsOfService, AccountCreationEmailInstructions} = require('./customize')

