Adding router, fixed form bug, updating routes