Updated forms and configuration to complete basic setup