Changes to index and form app