Cleaned up Form/Controller code.
Fixed routing for beta3.
Minor styling fix.