Made changes to YearActivity.java and some other minor things