Updated form and homepage