added main icon; fixed cal bug