Some form tweaking and seperate URLs for app