Fix moon display issue and increase moon randomness