Urls and forms fixes