Refactor index redirection
Add firm creation