fixed cal classes and link to for appropriate cal versions
move cal functionality into partial