Major changes

~!stuff done in class, fixes & cal addition
new nav

changed cal too
basic