Updated scaffold and forms