Complete Registration Modal

Also includes router modifications