Added form and switched to URL params