Changed json calls for frontend a little