Fixed routing and form issues