Lots of changes, calendar class made and implemented through out application