Changed the way we dealt with dates in several places. Still a bug in displaying year in AccountActivity