Calendar Addition

Also changed Index Layout