Made routes work, and fixed json layout